debian-opt

Gbp-Pq: Name debian-opt.diff

diff --git a/config_host.mk.in b/config_host.mk.in
index 733f9041cdeda79d23484e7284c57935007550ad..d831556ba95d68a207bd2f48e05a5ca02dba8761 100644 (file)
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -61,6 +61,7 @@ export CPPUNIT_CFLAGS=@CPPUNIT_CFLAGS@
 export CPPUNIT_LIBS=@CPPUNIT_LIBS@
 export CPU=@CPU@
 export CPUNAME=@CPUNAME@
+export CDEFAULTOPT=@CDEFAULTOPT@
 export CPUNAME_FOR_BUILD=@CPUNAME_FOR_BUILD@
 export CPU_FOR_BUILD=@CPU_FOR_BUILD@
 export CROSS_COMPILING=@CROSS_COMPILING@

diff --git a/configure.in b/configure.in
index 95bd31c4bdd40bcb417e9ffb7eb77c17e986095e..cb17302f45b97eb393fcbbad7b0a6c50db87efe4 100644 (file)
Binary files a/configure.in and b/configure.in differ

diff --git a/solenv/inc/unxgcc.mk b/solenv/inc/unxgcc.mk
index 2da3ef0f524a7014c7eac3eef0e87f2eb8c46efc..0d4cf9de788fa88dd97fe5916d8501462f4d949f 100644 (file)
--- a/solenv/inc/unxgcc.mk
+++ b/solenv/inc/unxgcc.mk
@@ -31,7 +31,7 @@ ASM*=
 AFLAGS*=
 SOLAR_JAVA*=
 # default optimization level for product code
-CDEFAULTOPT*=-O2
+CDEFAULTOPT*=$(shell dpkg-buildflags --get CFLAGS 2>/dev/null | $(GREP) -E -o "\-O[0-3]" || echo "-O2")
 # architecture dependent flags for the C and C++ compiler that can be changed by
 # exporting the variable ARCH_FLAGS="..." in the shell, which is used to start build
 ARCH_FLAGS*=

diff --git a/solenv/inc/unxlngi.mk b/solenv/inc/unxlngi.mk
index 79c255c326a265681be78cd677ce2901af44c99d..40ff07d59472dc173f2ce6cfb46f2fc7c7b8eea8 100644 (file)
--- a/solenv/inc/unxlngi.mk
+++ b/solenv/inc/unxlngi.mk
@@ -26,7 +26,6 @@
 #*************************************************************************
 
 # mk file for Unix Linux Intel (X86) using GCC, please make generic modifications to unxlng.mk
-CDEFAULTOPT=-Os
 .IF "$(GCCNUMVER)" >= "000400050000"
 ARCH_FLAGS*=-mtune=atom
 .ELSE

diff --git a/solenv/inc/unxlngmips.mk b/solenv/inc/unxlngmips.mk
index 783305d6c9d18c1fa33e8709aa6591009ad0bc71..2e47da2c4fee55d9bb433b6eef600edb707a09eb 100644 (file)
--- a/solenv/inc/unxlngmips.mk
+++ b/solenv/inc/unxlngmips.mk
@@ -27,6 +27,5 @@
 
 # mk file for Unix Linux Mips using GCC, please make generic modifications to unxlng.mk
 
-CDEFAULTOPT=-Os
 .INCLUDE : unxlng.mk
 CDEFS+=-DMIPS

diff --git a/solenv/inc/unxlngr.mk b/solenv/inc/unxlngr.mk
index 81ee90ca4f0edd7064265e49c5c748562d29e6a5..c855716980ed919c25027cfec954b92b2bc39120 100644 (file)
--- a/solenv/inc/unxlngr.mk
+++ b/solenv/inc/unxlngr.mk
@@ -27,7 +27,6 @@
 
 # mk file for Unix Linux ARM using GCC, please make generic modifications to unxlng.mk
 
-CDEFAULTOPT=-Os
 .INCLUDE : unxlng.mk
 CDEFS+=-DARM32
 CFLAGS+=-fno-omit-frame-pointer

diff --git a/solenv/inc/unxlngs.mk b/solenv/inc/unxlngs.mk
index 390244f31d6c04fa6b4a30c82037a7cf0003e020..9827c22a725f8e99822cc85dc4f89ddc0629caae 100644 (file)
--- a/solenv/inc/unxlngs.mk
+++ b/solenv/inc/unxlngs.mk
@@ -29,7 +29,6 @@
 
 ASM=$(CC)
 AFLAGS=-Wa,-K,PIC -c $(CDEFS)
-CDEFAULTOPT=-Os
 PICSWITCH:=-fPIC
 .INCLUDE : unxlng.mk
 CDEFS+=-DSPARC